From: Liu, Jinsong <jinsong.liu@intel.com>
Date: Thu, 7 Apr 2011 11:12:01 +0000 (+0100)
Subject: X86: Fix mce offline page bug
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22man:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22man:/?a=commitdiff_plain;h=51402ed6092b02882f6483f94137c420bdd0e234;p=xen.git

X86: Fix mce offline page bug

c/s 19913 break mce offline page logic:
For page_state_is(pg, free), it's impossible to trigger the case;
For page_state_is(pg, offlined), it in fact didn't offline related
page;

This patch fix the bug, and remove an ambiguous comment.

Signed-off-by: Liu, Jinsong <jinsong.liu@intel.com>
---

diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c
index a3f890f733..46b4b5c557 100644
--- a/xen/common/page_alloc.c
+++ b/xen/common/page_alloc.c
@@ -611,10 +611,6 @@ static void free_heap_pages(
 
 
 /*
- * Following possible status for a page:
- * free and Online; free and offlined; free and offlined and broken;
- * assigned and online; assigned and offlining; assigned and offling and broken
- *
  * Following rules applied for page offline:
  * Once a page is broken, it can't be assigned anymore
  * A page will be offlined only if it is free
@@ -711,16 +707,11 @@ int offline_page(unsigned long mfn, int broken, uint32_t *status)
 
     old_info = mark_page_offline(pg, broken);
 
-    if ( page_state_is(pg, free) )
+    if ( page_state_is(pg, offlined) )
     {
-        /* Free pages are reserve directly */
         reserve_heap_page(pg);
         *status = PG_OFFLINE_OFFLINED;
     }
-    else if ( page_state_is(pg, offlined) )
-    {
-        *status = PG_OFFLINE_OFFLINED;
-    }
     else if ( (owner = page_get_owner_and_reference(pg)) )
     {
             *status = PG_OFFLINE_OWNED | PG_OFFLINE_PENDING |